Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jan 2010 06:54:49 +0000 (06:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jan 2010 06:54:49 +0000 (06:54 +0000)

Trivial merge